Add support for PHPStan 2

.gitattributes

@@ -4,7 +4,7 @@ test/                                   export-ignore
 .editorconfig                           export-ignore
 .gitattributes                          export-ignore
 .gitignore                              export-ignore
-.php_cs                                 export-ignore
+.php-cs-fixer.php                       export-ignore
 .yamllint.yaml                          export-ignore
 composer.lock                           export-ignore
 Makefile                                export-ignore

.github/workflows/integrate.yaml

@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.1"
+          - "7.4"
 
         dependencies:
           - "locked"
@@ -75,7 +75,7 @@ jobs:
           restore-keys: "php-${{ matrix.php-version }}-php-cs-fixer-"
 
       - name: "Run friendsofphp/php-cs-fixer"
-        run: "vendor/bin/php-cs-fixer fix --ansi --config=.php_cs --diff --diff-format=udiff --dry-run --verbose"
+        run: "vendor/bin/php-cs-fixer fix --ansi --config=.php-cs-fixer.php --diff --dry-run --verbose"
 
   static-code-analysis:
     name: "Static Code Analysis"
@@ -90,10 +90,7 @@ jobs:
           - "7.4"
 
         phpunit-version:
-          - "6.0.0"
-          - "7.0.0"
-          - "8.0.0"
-          - "9.0.0"
+          - "9.1.0"
 
         dependencies:
           - "lowest"

.php_cs → .php-cs-fixer.php

@@ -18,12 +18,12 @@
     __DIR__ . '/LICENSE.md',
     License\Year::fromString('2018'),
     License\Holder::fromString('Jan Gregor Emge-Triebel'),
-    License\Url::fromString('https://github.com/Jan0707/phpstan-prophecy')
+    License\Url::fromString('https://github.com/Jan0707/phpstan-prophecy'),
 );
 
 $license->save();
 
-$config = PhpCsFixer\Config\Factory::fromRuleSet(new PhpCsFixer\Config\RuleSet\Php71($license->header()), [
+$config = PhpCsFixer\Config\Factory::fromRuleSet(new PhpCsFixer\Config\RuleSet\Php74($license->header()), [
     'final_class' => false,
 ]);
 
@@ -36,7 +36,7 @@
     ->ignoreDotFiles(false)
     ->in(__DIR__)
     ->name('*.phpstub')
-    ->name('.php_cs');
+    ->name('.php-cs-fixer.php');
 
 $config->setCacheFile(__DIR__ . '/.build/php-cs-fixer/.php_cs.cache');
 

Makefile

@@ -11,7 +11,7 @@ coding-standards: vendor ## Normalizes composer.json with ergebnis/composer-norm
 	composer normalize
 	yamllint -c .yamllint.yaml --strict .
 	mkdir -p .build/php-cs-fixer
-	vendor/bin/php-cs-fixer fix --config=.php_cs --diff --diff-format=udiff --verbose
+	export PHP_CS_FIXER_IGNORE_ENV=1 && vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --diff --verbose
 
 .PHONY: help
 help: ## Displays this list of targets with descriptions
@@ -26,7 +26,7 @@ static-code-analysis: vendor ## Runs a static code analysis with phpstan/phpstan
 .PHONY: static-code-analysis-baseline
 static-code-analysis-baseline: vendor ## Generates a baseline for static code analysis with phpstan/phpstan and vimeo/psalm
 	mkdir -p .build/phpstan
-	vendor/bin/phpstan analyze --configuration=phpstan-with-extension.neon --generate-baseline=phpstan-with-extension-baseline.neon --memory-limit=-1
+	vendor/bin/phpstan analyze --configuration=phpstan-with-extension.neon --generate-baseline=phpstan-with-extension-baseline.neon --allow-empty-baseline --memory-limit=-1
 	vendor/bin/phpstan analyze --configuration=phpstan-without-extension.neon --generate-baseline=phpstan-without-extension-baseline.neon --memory-limit=-1
 
 .PHONY: tests

composer.json

@@ -10,19 +10,21 @@
     }
   ],
   "require": {
-    "php": "^7.1 || ^8.0",
-    "phpstan/phpstan": "^1.0.0"
+    "php": "^7.4 || ^8.0",
+    "phpstan/phpstan": "^2.0.0"
   },
   "conflict": {
-    "phpspec/prophecy": "<1.7.0 || >=2.0.0",
-    "phpunit/phpunit": "<6.0.0 || >=12.0.0"
+    "phpspec/prophecy": "<1.17.0 || >=2.0.0",
+    "phpspec/prophecy-phpunit": "<2.3.0 || >=3.0.0",
+    "phpunit/phpunit": "<9.1.0 || >=12.0.0"
   },
   "require-dev": {
     "ergebnis/composer-normalize": "^2.1.1",
     "ergebnis/license": "^1.0.0",
-    "ergebnis/php-cs-fixer-config": "~2.2.0",
+    "ergebnis/php-cs-fixer-config": "^4.0 || ^5.0 || ^6.0",
     "phpspec/prophecy": "^1.7.0",
-    "phpunit/phpunit": "^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0"
+    "phpspec/prophecy-phpunit": "^2.3",
+    "phpunit/phpunit": "^9.1.0"
   },
   "config": {
     "allow-plugins": {